(create-fontset-from-x-resource):

Handle the error of X resource more gracefully.

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index b8c4a964b82ac1ef126b2fd24304970c5c8e2427..7fa9761ef07b626c8a02d4a32b87a40628eb6ef4 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -944,7 +944,9 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
        fontset-spec)
     (while (setq fontset-spec (x-get-resource (format "fontset-%d" idx)
                                              (format "Fontset-%d" idx)))
-      (create-fontset-from-fontset-spec fontset-spec t 'noerror)
+      (condition-case nil
+         (create-fontset-from-fontset-spec fontset-spec t 'noerror)
+       (error (message "Fontset-%d: invalid specification in X resource" idx)))
       (setq idx (1+ idx)))))
 
 ;;